Regenerate autoconf and internal_styles. Comment gbversion.h life cycle. Fix depend...

diff --git a/Makefile.in b/Makefile.in
index 4f3964f1ff7fd79075d443f7a97d2be000d3d8ee..5a316d8678c519d5994c774a340633322009e11f 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -105,7 +105,7 @@ gpsbabel$(EXEEXT): configure Makefile $(OBJS) @GPSBABEL_DEBUG@
 gpsbabel-debug: $(OBJS)
        $(CC)  $(CFLAGS) $(LDFLAGS) $(OBJS) @LIBS@ @EFENCE_LIB@ @EXPAT_LIB@ @USB_LIBS@ $(OUTPUT_SWITCH)$@
 
-Makefile gbversion.h: Makefile.in config.status xmldoc/makedoc.in
+Makefile gbversion.h: Makefile.in config.status xmldoc/makedoc.in gbversion.h.in
        CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status 
 
 config.status: configure 

diff --git a/configure b/configure
index 5acd2f53970ae7e6c05037d502e25e6bd82ff179..3fe6c319cc891c1543bf0e2f40fdc8b2028d96a7 100755 (executable)
--- a/configure
+++ b/configure
@@ -3173,6 +3173,11 @@ else
                        xpathdr=/sw/include/
                fi
                ;;
+       *-*-freebsd*)
+               if test -f /usr/local/include/expat.h ; then
+                       xpathdr=/usr/local/include
+               fi
+               ;;
        *)      ;;
        esac
 
@@ -3204,6 +3209,17 @@ cat >>confdefs.h <<\_ACEOF
 _ACEOF
 
 
+               fi
+               ;;
+       *-*-freebsd*)
+               if test -f /usr/local/lib/libexpat.a ; then
+                       EXPAT_LIB=/usr/local/lib/libexpat.a
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_LIBEXPAT 1
+_ACEOF
+
+
                fi
                ;;
        *)

diff --git a/gbversion.h b/gbversion.h
index c1075bd69b6048bfed94fc8dc3382677fd5b9663..e7f12b5e45d56b7398ef0145efe598da4711a90d 100644 (file)
--- a/gbversion.h
+++ b/gbversion.h
@@ -1,2 +1,8 @@
+/*
+ * gbversion.h is generated from gbversion.h.in which uses autoconf voodoo
+ * to get the version number from configure.in.
+ *
+ * Isn't simplification via automation grand?
+ */
 #define VERSION "1.3.3-beta20061125"
 

diff --git a/gbversion.h.in b/gbversion.h.in
index cb98510aca2674c41edea7cce30df74f966171b4..db491f99ee5810ea7a242d3997f2232d012e4fc0 100644 (file)
--- a/gbversion.h.in
+++ b/gbversion.h.in
@@ -1,2 +1,8 @@
+/*
+ * gbversion.h is generated from gbversion.h.in which uses autoconf voodoo
+ * to get the version number from configure.in.
+ *
+ * Isn't simplification via automation grand?
+ */
 #define VERSION "@GBMAJOR@.@GBMINOR@.@GBMICRO@@PACKAGE_RELEASE@"
 

diff --git a/internal_styles.c b/internal_styles.c
index 00e762b14d31ec7d0ecddc383a267c00a51a0224..17d3078eb5bbede6d28c147a7e535871258be910 100644 (file)
--- a/internal_styles.c
+++ b/internal_styles.c
@@ -439,8 +439,8 @@ static char gpsdrivetrack[] =
 "IFIELD        ALT_METERS, \"\", \"%10.0f\"\n"
 "# Reports are that this format stores in local time, not GMT as \n"
 "# originally thought.\n"
-"# IFIELD      GMT_TIME, \"\", \"%a %b %d %T %Y\"\n"
-"IFIELD        LOCAL_TIME, \"\", \"%a %b %d %T %Y\"\n"
+"# IFIELD      GMT_TIME, \"\", \"%a %b %d %H:%M:%S %Y\"\n"
+"IFIELD        LOCAL_TIME, \"\", \"%a %b %d %H:%M:%S %Y\"\n"
 ;
 static char gpsman[] = 
 "# gpsbabel XCSV style file\n"
@@ -478,6 +478,54 @@ static char gpsman[] =
 
 "# gpsman.c likes mkshort len = 8, whitespace = 0.\n"
 ;
+static char kompass_tk[] = 
+"# gpsbabel XCSV style file\n"
+"#\n"
+"# Format: Kompass / Deutscher Alpenverein (DAV) Waypoints\n"
+"# Author: Olaf Klein\n"
+"#   Date: 01/10/2007\n"
+"#\n"
+"# \n"
+"DESCRIPTION           Kompass (DAV) Track (.tk)\n"
+"DATATYPE              TRACK\n"
+"EXTENSION             wp\n"
+"FIELD_DELIMITER               COMMA\n"
+"RECORD_DELIMITER      NEWLINE\n"
+"BADCHARS              ,\"\n"
+"#\n"
+"# INDIVIDUAL DATA FIELDS, IN ORDER OF APPEARANCE:\n"
+"#\n"
+"IFIELD        LAT_DECIMAL, \"\", \"%.7f\"\n"
+"IFIELD        LON_DECIMAL, \"\", \"%.7f\"\n"
+;
+static char kompass_wp[] = 
+"# gpsbabel XCSV style file\n"
+"#\n"
+"# Format: Kompass / Deutscher Alpenverein (DAV) Waypoints\n"
+"# Author: Olaf Klein\n"
+"#   Date: 01/10/2007\n"
+"#\n"
+"# \n"
+"DESCRIPTION           Kompass (DAV) Waypoints (.wp)\n"
+"DATATYPE              WAYPOINT\n"
+"EXTENSION             wp\n"
+"ENCODING              UTF-8\n"
+"FIELD_DELIMITER               SEMICOLON\n"
+"RECORD_DELIMITER      CRNEWLINE\n"
+"BADCHARS              ,\"\n"
+"#\n"
+"# INDIVIDUAL DATA FIELDS, IN ORDER OF APPEARANCE:\n"
+"#\n"
+"IFIELD        SHORTNAME, \"\", \"%s\"\n"
+"IFIELD        LON_DECIMAL, \"\", \"%.7f\"\n"
+"IFIELD        LAT_DECIMAL, \"\", \"%.7f\"\n"
+"IFIELD        ALT_METERS, \"\", \"%.0f\"\n"
+"IFIELD        LOCAL_TIME,\"\",\"%d.%m.%Y %H:%M:%S\"\n"
+"IFIELD        CONSTANT, \"Icons\\Wegpunkt grün.bmp\", \"%s\"\n"
+"IFIELD        IGNORE, \"\", \"%s\"\n"
+"IFIELD  CONSTANT, \"1\", \"%s\"                       # unknown\n"
+"IFIELD        DESCRIPTION, \"\", \"%s\"\n"
+;
 static char ktf2[] = 
 "# gpsbabel XCSV style file\n"
 "#\n"
@@ -1000,8 +1048,8 @@ static char xmapwpt[] =
 "IFIELD        IGNORE, \"\", \"%-.31s\"\n"
 "IFIELD        DESCRIPTION, \"\", \"%-.78s\"\n"
 ;
-style_vecs_t style_list[] = {{ "xmapwpt", xmapwpt } , { "xmap", xmap } , { "xmap2006", xmap2006 } , { "tabsep", tabsep } , { "sportsim", sportsim } , { "saplus", saplus } , { "s_and_t", s_and_t } , { "openoffice", openoffice } , { "nima", nima } , { "mxf", mxf } , { "mapconverter", mapconverter } , { "kwf2", kwf2 } , { "ktf2", ktf2 } , { "gpsman", gpsman } , { "gpsdrivetrack", gpsdrivetrack } , { "gpsdrive", gpsdrive } , { "geonet", geonet } , { "garmin_poi", garmin_poi } , { "garmin301", garmin301 } , { "fugawi", fugawi } , { "dna", dna } , { "custom", custom } , { "cup", cup } , { "csv", csv } , { "cambridge", cambridge } , { "arc", arc } ,  {0,0}};
-size_t nstyles = 26;
+style_vecs_t style_list[] = {{ "xmapwpt", xmapwpt } , { "xmap", xmap } , { "xmap2006", xmap2006 } , { "tabsep", tabsep } , { "sportsim", sportsim } , { "saplus", saplus } , { "s_and_t", s_and_t } , { "openoffice", openoffice } , { "nima", nima } , { "mxf", mxf } , { "mapconverter", mapconverter } , { "kwf2", kwf2 } , { "ktf2", ktf2 } , { "kompass_wp", kompass_wp } , { "kompass_tk", kompass_tk } , { "gpsman", gpsman } , { "gpsdrivetrack", gpsdrivetrack } , { "gpsdrive", gpsdrive } , { "geonet", geonet } , { "garmin_poi", garmin_poi } , { "garmin301", garmin301 } , { "fugawi", fugawi } , { "dna", dna } , { "custom", custom } , { "cup", cup } , { "csv", csv } , { "cambridge", cambridge } , { "arc", arc } ,  {0,0}};
+size_t nstyles = 28;
 #else /* CSVFMTS_ENABLED */
 style_vecs_t style_list[] = {{0,0}};
 size_t nstyles = 0;